yaml/yml label file if/else guards #23717
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wxiaoguang
reviewed
Mar 26, 2023
modules/label/parser.go
Outdated
| data, err = options.Labels(name) | ||
| if err != nil { | ||
| return nil, ErrTemplateLoad{name, fmt.Errorf("GetRepoInitFile: %w", err)} | ||
| if filepath.Ext(name) == ". yaml" { |
There was a problem hiding this comment.
Some questions:
". yaml": a space in it?- Gitea has builtin
Advanced.yaml, if a user puts a customizedAdvance.yml, then still the builtinAdvanced.yamlis used?
There was a problem hiding this comment.
- Typo (will correct )
- Good question. I need to check but the built-in Advanced.yaml isn't in the custom options directory. It does raise the question that if some adds foo.yaml and foo.yml ... What should be used
GiteaBot
added
the
lgtm/need 2
|
I don't think this is right. Is the intention here that if See #23719 |
The intent was if the suffix was yaml then execute the parser but I don't think your proposed solution actually solves the problem. |
zeripath
added a commit
to zeripath/gitea
that referenced
this pull request
Mar 27, 2023
…o options The previous code did not remove the .yaml/.yml extension from label files within the customPath. This would lead to duplicate lists of labels. Fix go-gitea#23715 Close go-gitea#23717 Signed-off-by: Andrew Thornton <art27@cantab.net>
lunny
pushed a commit
that referenced
this pull request
Apr 10, 2023
Fix #23715 Other related PRs: * #23717 * #23716 * #23719 This PR is different from others, it tries to resolve the problem fundamentally (and brings more benefits) Although it looks like some more lines are added, actually many new lines are for tests. ---- Before, the code was just "guessing" the file type and try to parse them. <details>  </details> This PR: * Always remember the original option file names, and always use correct parser for them. * Another benefit is that we can sort the Label Templates now (before there was a map, its key order is undefined) 
wxiaoguang
added a commit
to wxiaoguang/gitea
that referenced
this pull request
Apr 12, 2023
…23749) Fix go-gitea#23715 Other related PRs: * go-gitea#23717 * go-gitea#23716 * go-gitea#23719 This PR is different from others, it tries to resolve the problem fundamentally (and brings more benefits) Although it looks like some more lines are added, actually many new lines are for tests. ---- Before, the code was just "guessing" the file type and try to parse them. <details>  </details> This PR: * Always remember the original option file names, and always use correct parser for them. * Another benefit is that we can sort the Label Templates now (before there was a map, its key order is undefined)  # Conflicts: # modules/label/parser.go # routers/web/org/setting.go # routers/web/repo/issue_label.go # templates/repo/create.tmpl # templates/repo/issue/labels/label_load_template.tmpl
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ensure the legacy label parser is not called if a yaml file is detected. fixes #23715
Signed-off-by: Jon Roadley-Battin jon.roadleybattin@gmail.com